Correct reads of gpx 'fix' value.

diff --git a/gpx.c b/gpx.c
index f07198a455067b01cc3650ab4a635917c395b993..36cdb849306fc610956c80f0bb0364e5bd7a7d3e 100644 (file)
--- a/gpx.c
+++ b/gpx.c
@@ -837,7 +837,17 @@ gpx_end(void *data, const char *el)
                wpt_tmp->sat = atof(cdatastrp);
                break;
        case tt_fix:
-               wpt_tmp->fix = atof(cdatastrp);
+               wpt_tmp->fix = atoi(cdatastrp)-1;
+               if ( wpt_tmp->fix < fix_2d) {
+                       if (!strcasecmp(cdatastrp, "none"))
+                               wpt_tmp->fix = fix_none;
+                       else if (!strcasecmp(cdatastrp, "dgps"))
+                               wpt_tmp->fix = fix_dgps;
+                       else if (!strcasecmp(cdatastrp, "pps"))
+                               wpt_tmp->fix = fix_pps;
+                       else
+                               wpt_tmp->fix = fix_unknown;
+               }
                break;
        case tt_unknown:
                end_something_else();